From: Tim Deegan <tim@xen.org>
Date: Tue, 23 Aug 2011 09:54:27 +0000 (+0100)
Subject: Passthrough: fix iommu_use_hap_pt() to use hap_enabled()
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~9943
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=91326b5491174ff4cbd36a98367b1bc7c378bd29;p=xen.git

Passthrough: fix iommu_use_hap_pt() to use hap_enabled()

In line with 22924:86000076dcee, paging_mode_hap(d) shouldn't be
used in HAP internals that are called during HAP setup.

Signed-off-by: Tim Deegan <tim@xen.org>
---

diff --git a/xen/include/xen/iommu.h b/xen/include/xen/iommu.h
index ade8690417..459c6ceb4d 100644
--- a/xen/include/xen/iommu.h
+++ b/xen/include/xen/iommu.h
@@ -35,7 +35,7 @@ extern bool_t iommu_debug;
 extern bool_t amd_iommu_perdev_intremap;
 
 /* Does this domain have a P2M table we can use as its IOMMU pagetable? */
-#define iommu_use_hap_pt(d) (paging_mode_hap(d) && iommu_hap_pt_share)
+#define iommu_use_hap_pt(d) (hap_enabled(d) && iommu_hap_pt_share)
 
 extern struct rangeset *mmio_ro_ranges;